From e183a44d5447037ea807698b08d5a9497891628b Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 30 Jul 2022 11:13:39 -0700 Subject: get invoice by uuid --- src/routes/[username]/index.js | 3 + src/routes/[username]/index.svelte | 27 +++++ src/routes/[username]/receive.svelte | 188 +++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+) create mode 100644 src/routes/[username]/index.js create mode 100644 src/routes/[username]/index.svelte create mode 100644 src/routes/[username]/receive.svelte (limited to 'src/routes/[username]') diff --git a/src/routes/[username]/index.js b/src/routes/[username]/index.js new file mode 100644 index 00000000..39a216c2 --- /dev/null +++ b/src/routes/[username]/index.js @@ -0,0 +1,3 @@ +export async function GET({ params }) { + return { body: params } +} diff --git a/src/routes/[username]/index.svelte b/src/routes/[username]/index.svelte new file mode 100644 index 00000000..fe1f7754 --- /dev/null +++ b/src/routes/[username]/index.svelte @@ -0,0 +1,27 @@ + + +{#if $user?.username === username} + +
+
+
+ Signed in as {username} +
+ +
+ + + +
+
+
+{/if} diff --git a/src/routes/[username]/receive.svelte b/src/routes/[username]/receive.svelte new file mode 100644 index 00000000..9ebc0401 --- /dev/null +++ b/src/routes/[username]/receive.svelte @@ -0,0 +1,188 @@ + + +{#if $user} + + +
+ {#if $rate} +
+ +
+
+ {useFiat ? `$${amountFiat}` : amountSatsFormatted}{useFiat ? 'USD' : 'SATS'} +
+ {useFiat ? `${amountSatsConverted} SATS` : `${amountFiatConverted} USD`} + +
+ + + {#if message} +
+ +

{message}

+
+ {/if} + + +
+ {#each numPad as value} + {#if value === '<'} + + {:else} + + {/if} + {/each} +
+ + +
+ + +
+
+ {:else} +
+ {/if} +
+{/if} -- cgit v1.2.3 From ef3bd2f6687d0bfca1b85cc3f4be47c8e628c748 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 30 Jul 2022 11:50:42 -0700 Subject: invoice updates --- src/routes/[username]/receive.svelte | 2 +- src/routes/invoice/[id].js | 6 +- src/routes/invoice/[id].svelte | 290 +++++++++++++++++------------------ src/routes/invoice/index.js | 4 +- 4 files changed, 144 insertions(+), 158 deletions(-) (limited to 'src/routes/[username]') diff --git a/src/routes/[username]/receive.svelte b/src/routes/[username]/receive.svelte index 9ebc0401..e0bf7751 100644 --- a/src/routes/[username]/receive.svelte +++ b/src/routes/[username]/receive.svelte @@ -82,7 +82,7 @@ }; let submit = async () => { - let { id } = await post('/invoice', { amount, username: $page.params.username }); + let { id } = await post('/invoice', { amount, rate: $rate, username: $page.params.username }); console.log(id) goto(`/invoice/${id}`); }; diff --git a/src/routes/invoice/[id].js b/src/routes/invoice/[id].js index 37ef098d..7d18ba86 100644 --- a/src/routes/invoice/[id].js +++ b/src/routes/invoice/[id].js @@ -5,7 +5,9 @@ const username = 'bob', export async function GET({ params }) { let { id } = params; - let { amount, text } = await get(`/invoice?uuid=${id}`); + let huh = await get(`/invoice?uuid=${id}`); + console.log(huh) + let { amount, rate, text } = await get(`/invoice?uuid=${id}`); - return { body: { amount, text } }; + return { body: { amount, rate, text } }; } diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte index d1dea907..a9f3cefb 100644 --- a/src/routes/invoice/[id].svelte +++ b/src/routes/invoice/[id].svelte @@ -1,25 +1,25 @@ diff --git a/src/lib/socket.js b/src/lib/socket.js index 14555bd3..36d41ea8 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -47,8 +47,8 @@ export function connect() { } export function close() { - if (socket) socket.close(); -} + if (socket) socket.close(); +} function onWebsocketMessage(msg) { let { type, data } = JSON.parse(msg.data); diff --git a/src/lib/utils.js b/src/lib/utils.js index e9d1b73e..22c88522 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -8,7 +8,7 @@ const base = browser ? '' : import.meta.env.VITE_COINOS_URL; export const get = (url) => fetch(base + url, { - headers: { accept: 'application/json'} + headers: { accept: 'application/json' } }).then((r) => r.json()); export const post = (url, body) => diff --git a/src/routes/[username]/index.js b/src/routes/[username]/index.js index 39a216c2..01613574 100644 --- a/src/routes/[username]/index.js +++ b/src/routes/[username]/index.js @@ -1,3 +1,3 @@ export async function GET({ params }) { - return { body: params } + return { body: params }; } diff --git a/src/routes/[username]/index.svelte b/src/routes/[username]/index.svelte index fe1f7754..91744aa3 100644 --- a/src/routes/[username]/index.svelte +++ b/src/routes/[username]/index.svelte @@ -2,8 +2,6 @@ import { AppHeader, Icon } from '$comp'; import { user } from '$lib/store'; export let username; - - console.log($user, username); {#if $user?.username === username} diff --git a/src/routes/[username]/receive.svelte b/src/routes/[username]/receive.svelte index d588eaed..5865d5e5 100644 --- a/src/routes/[username]/receive.svelte +++ b/src/routes/[username]/receive.svelte @@ -94,8 +94,7 @@ }; let submit = async () => { - let { id } = await post('/invoice', { amount, rate: $rate, username: $page.params.username }); - console.log(id) + let { id } = await post('/invoice', { amount, rate: $rate, username: $page.params.username }); goto(`/invoice/${id}`); }; diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 1e4e2560..85f5a817 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -25,6 +25,6 @@ {#if ready} - + {/if} diff --git a/src/routes/invoice/[id].js b/src/routes/invoice/[id].js index 7d18ba86..9a38604f 100644 --- a/src/routes/invoice/[id].js +++ b/src/routes/invoice/[id].js @@ -6,7 +6,6 @@ const username = 'bob', export async function GET({ params }) { let { id } = params; let huh = await get(`/invoice?uuid=${id}`); - console.log(huh) let { amount, rate, text } = await get(`/invoice?uuid=${id}`); return { body: { amount, rate, text } }; diff --git a/src/routes/invoice/index.js b/src/routes/invoice/index.js index d89f7130..f6b1f2cf 100644 --- a/src/routes/invoice/index.js +++ b/src/routes/invoice/index.js @@ -3,9 +3,12 @@ import { post } from '$lib/utils'; let network = 'lightning'; export async function POST({ request }) { - let { amount, rate, username } = await request.json(); - let { text } = await post('/lightning/invoice', ); - let { uuid: id } = await post('/invoice', { invoice: { amount, currency: 'USD', network, rate, text }, user: { username } }); + let { amount, rate, username } = await request.json(); + let { text } = await post('/lightning/invoice'); + let { uuid: id } = await post('/invoice', { + invoice: { amount, currency: 'USD', network, rate, text }, + user: { username } + }); return { body: { id } }; } diff --git a/src/routes/logout/done.svelte b/src/routes/logout/done.svelte index 894c7b99..50fb766e 100644 --- a/src/routes/logout/done.svelte +++ b/src/routes/logout/done.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/logout/index.js b/src/routes/logout/index.js index 80e65f8b..6cbae8f2 100644 --- a/src/routes/logout/index.js +++ b/src/routes/logout/index.js @@ -1,26 +1,26 @@ -import cookie from "cookie"; +import cookie from 'cookie'; const opts = { - httpOnly: true, - sameSite: "lax", - path: "/", + httpOnly: true, + sameSite: 'lax', + path: '/' }; export async function GET({ request: { headers } }) { - return { - status: 302, - headers: { - location: "/logout/done", - "set-cookie": [ - cookie.serialize("token", "", { - ...opts, - expires: new Date(0), - }), - cookie.serialize("refresh_token", "", { - ...opts, - expires: new Date(0), - }), - ], - }, - }; + return { + status: 302, + headers: { + location: '/logout/done', + 'set-cookie': [ + cookie.serialize('token', '', { + ...opts, + expires: new Date(0) + }), + cookie.serialize('refresh_token', '', { + ...opts, + expires: new Date(0) + }) + ] + } + }; } -- cgit v1.2.3 From 9291b50da24eec4bd9d96d05e2bb4ae40c61b3bb Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sat, 30 Jul 2022 14:00:08 -0600 Subject: add 404 component, remove duplicate redirects, loading splash, fix lgout --- src/components/404.svelte | 16 ++ src/components/index.js | 1 + src/routes/[username]/index.svelte | 4 +- src/routes/[username]/receive.svelte | 16 +- src/routes/__layout.svelte | 3 + src/routes/invoice/[amount].svelte | 336 ----------------------------------- src/routes/invoice/[id].svelte | 17 +- src/routes/logout/done.svelte | 2 +- 8 files changed, 36 insertions(+), 359 deletions(-) create mode 100644 src/components/404.svelte delete mode 100644 src/routes/invoice/[amount].svelte (limited to 'src/routes/[username]') diff --git a/src/components/404.svelte b/src/components/404.svelte new file mode 100644 index 00000000..503316bb --- /dev/null +++ b/src/components/404.svelte @@ -0,0 +1,16 @@ + + +
+
+ + + + + + +

404

+

Page not found.

+
+
diff --git a/src/components/index.js b/src/components/index.js index e41c3d4c..53f0fe99 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -8,3 +8,4 @@ export { default as Image } from './Image.svelte'; export { default as RegisterOrLogin } from './RegisterOrLogin.svelte'; export { default as AppHeader } from './AppHeader.svelte'; export { default as LoadingSplash } from './LoadingSplash.svelte'; +export { default as PageNotFound } from './404.svelte'; diff --git a/src/routes/[username]/index.svelte b/src/routes/[username]/index.svelte index 91744aa3..90d0c04a 100644 --- a/src/routes/[username]/index.svelte +++ b/src/routes/[username]/index.svelte @@ -1,5 +1,5 @@ @@ -22,4 +22,6 @@
+{:else} + {/if} diff --git a/src/routes/[username]/receive.svelte b/src/routes/[username]/receive.svelte index 5865d5e5..50fddbed 100644 --- a/src/routes/[username]/receive.svelte +++ b/src/routes/[username]/receive.svelte @@ -1,23 +1,11 @@ - -{#if $user} -
- - -
-
- {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} - -
-

Add a tip?

- -
- {tipAmountFormatted}{`(${tipAmountSats} SATS)`} - {tipPercent}% -
- - { - customTipAmount = ''; - tipPercent = e.target.value; - }} - /> - -
- {#each tipAmounts as amount} - - {/each} - -
- $ - handleCustomTipAmount(e)} - class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" - placeholder="Other" - /> - -
-
-
- -